Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 4 Sep 2011 22:01:52 +0000 (15:01 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 4 Sep 2011 22:01:52 +0000 (15:01 -0700)

Trivial merge